GtkApplicationWindow: Avoid a crash

In several places, we were not correctly dealing with the
possibility of application not being set.

diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index bf037ffcb304b05786064b5ad11499ed6f126957..aba45a75e73eb3a8c864c1de7df51162bbb1f675 100644 (file)
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -298,9 +298,10 @@ gtk_application_window_update_shell_shows_app_menu (GtkApplicationWindow *window
       /* the shell does not show it, so make sure we show it */
       if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) == 0)
         {
-          GMenuModel *app_menu;
+          GMenuModel *app_menu = NULL;
 
-          app_menu = gtk_application_get_app_menu (gtk_window_get_application (GTK_WINDOW (window)));
+          if (gtk_window_get_application (GTK_WINDOW (window)) != NULL)
+            app_menu = gtk_application_get_app_menu (gtk_window_get_application (GTK_WINDOW (window)));
 
           if (app_menu != NULL)
             {
@@ -347,9 +348,10 @@ gtk_application_window_update_shell_shows_menubar (GtkApplicationWindow *window,
       /* the shell does not show it, so make sure we show it */
       if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->menubar_section)) == 0)
         {
-          GMenuModel *menubar;
+          GMenuModel *menubar = NULL;
 
-          menubar = gtk_application_get_menubar (gtk_window_get_application (GTK_WINDOW (window)));
+          if (gtk_window_get_application (GTK_WINDOW (window)) != NULL)
+            menubar = gtk_application_get_menubar (gtk_window_get_application (GTK_WINDOW (window)));
 
           if (menubar != NULL)
             g_menu_append_section (window->priv->menubar_section, NULL, menubar);